Merge change 1551

* changes:
  Added a note in response to external feedback.