Merge branch 'dev' into 2.1.0

wjc

2026-03-26 d4a638c6d3ad6aacf3273c601ac9140d137ae54f

 .gitignore

@@ -53,3 +53,4 @@
.idea/
*.properties
local.properties
local.properties