Merge pull request #8102 from JulioCesarMatias/FixGPSProvider