Merge "Enhance GAL Provider" into jb-ub-mail-ur10