Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'