Merge branch '5.1' into 38-coding-style-updates_5.1

1 job for !51 with 38-coding-style-updates_5.1 in 11 minutes and 21 seconds (queued for 47 minutes and 19 seconds)
merge request