Merge branch 'master' into google

wjc

2025-09-15 0ccb78cfb85fbba31ee16a57b13752747585b9a9

 .gitignore

@@ -52,3 +52,4 @@
.idea/workspace.xml
.idea/
*.properties
local.properties