Improve set/reset location
Merge branch 'fix_set_reset_of_location' into staging

* fix_set_reset_of_location:
  Improve set/reset location