CON-1446-user-login-menu | merge origin/CON-Venus into branch