Merge change 4252 into donut

* changes:
  Add more comment for EXTRA_APPEND_LOCATION