Merge branch 'master' into testing

See merge request !29

2 jobs for 1.19.5.1

in 2 minutes and 47 seconds and was queued for 2 minutes and 7 seconds