Merge change 4666

* changes:
  Another javadoc attempted fix.