Merge pull request #5899 from dbasch/gps_rescue_beta