Merge "Minor change to improve readability" into jb-ub-mail