Merge "Fixing bugs 6673815 and 6673190." into jb-ub-mail