Merge "Useful annotations for code documentation." into jb-mr1.1-dev