am c4c8bcaf: am 5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev

* commit 'c4c8bcaf857d7b02bb18193730012515945e1627':
  Show annotation information in generated documentation