Merge branch 'fix/mastofe-login-redirect' into 'develop'