Merge branch 'EKbfh-master-patch-05331' into 'master'

py_3.9.10

See merge request !10
19 jobs for master in 33 minutes and 45 seconds (queued for 2 seconds)