Merge change 1152 into donut

* changes:
  location: Remove two unnecessary variables.