Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'