am c10e65ac: Merge "DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""" into mnc-ub-dev

* commit 'c10e65ac58064ee1595864c2db3c39e35f70944f':
  DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs""