Merge branch 'cherry-pick-d4e0cc14' into 'testing'

cosmetic update

See merge request !164
1 job for testing in 3 seconds (queued for 1 second)