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

Knopkiwg testing patch 91364

See merge request !153
1 job for testing in 10 seconds (queued for 2 seconds)