Merge branch 'knopkiwg-testing-patch-12270' into 'testing'

Knopkiwg testing patch 12270

See merge request !151
1 job for testing in 11 seconds (queued for 2 seconds)