Merge "Use multi-model mode" into jb-ub-mail