Merge "manual_lat_lon" into "master"