Merge "fix build" into jb-ub-mail-ur8