Merge branch 2.1.12 with refs/heads/2.1 into refs/merge-requests/533/train

3 jobs for !533 with 2.1.12 into 2.1 in 27 minutes and 34 seconds (queued for 1 second)
merge train