Merge branch 'hotfix/NAGA_FIX-1'
change in login
Merge branch 'hotfix/MC-420' into develop