Merge branch 'fixed_contradicted_messages_in_login_view' into develop
Merge remote-tracking branch 'origin/develop' into develop