Merge "Minor comment fix" into jb-ub-mail