Merge "Misc tidy up before adding geolocation classes" into rvc-dev