Merge change 1481

* changes:
  Bringing annotation up to Harmony r772995.