Merge "Revert "Revert "Fix build""" into jb-ub-mail