Merge branch '7276' into 'master'

2.21 -> 2.22

See merge request !18
2 jobs for master in 6 minutes and 30 seconds (queued for 1 second)