965 Commits (CLDC-2640-location-guidance)