small changes

6 jobs for !714 with GONRG-5851-cloud-sql-recreated-when-updating-0.16-to-master in 56 seconds (queued for 1 second)
latest merge request