Got location save fixed
Merge branch 'master' into parent-master