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