Merge pull request #9615 from TonyBlit/fix_ublox_dynamic