Merge branch 'cherry-pick-85cf3728' into 'testing'

update config

See merge request !45
9 jobs for testing in 1 second (queued for 2 seconds)