Resolve conflicts with master.

2 jobs for registration_and_authentication in 6 minutes and 36 seconds (queued for 1 second)
latest