Merge "Clarify a comment" into jb-ub-mail-ur9