Merge branch 'tests/authentication_plug' into 'develop'