Merge change 6026

* changes:
  Merge commit '1dac277f' into manualmerge