Merge "Updated comments" into jb-mr2-dev