Merge remote-tracking branch 'refs/remotes/origin/teamup-override6-mobile-optimization'