Merge branch 'cherry-pick-79550d22' into 'testing'

update build script

See merge request !42
2 jobs for testing in 14 seconds (queued for 1 second)