GPS and Stop Alert fix
Merge GPS changes