Merge branch 'poc/location_tracker' into split/palmbb