[Fix build failed] Merge branch 'master' into feature/generic-user-popup.