Cherry-Pick Geo fixes into 15.6
What does this MR do and why?
Cherry-pick !107842 (merged) and !108153 (merged)
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.