Merge "General comments." into jb-ub-mail-ur10