Merge branch 'chores/2.4.1-develop' into 'develop'

Mergeback: 2.4.1

Closes #2758

See merge request !3520
18 jobs for develop in 96 minutes and 28 seconds (queued for 7 seconds)