Merge jb-ub-mail-ur10' into master

Change-Id: I9717293c60c311834c7c643cd27cee06149ec07a