Merge branch 'develop' into 19-bug-authentication

1 job for 19-bug-authentication in 3 minutes and 17 seconds (queued for 1 second)