Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'