Merge branch 'update_2_1' into '2.1'

Update 2.1

See merge request !500
3 jobs for !500 with update_2_1 into 2.1 in 7 minutes and 4 seconds (queued for 4 seconds)
latest