Merge pull request #19182 from MauricioFauth/gis-editor