Merge pull request #63 from luisromangz/8.1-ohiggins-SNAPSHOT

Changes for advancing #69710 and #69737
Merge branch '8.1-ohiggins-SNAPSHOT' of github.com:Emergya/persistence-geo into 8.1-ohiggins-SNAPSHOT