Merge branch 'cycles-authenticator' into 'develop'