Merge branch 'customizable_auth' into 'develop'