Merge "Show annotation information in generated documentation" into lmp-dev