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

update build and clean scripts

See merge request !44
2 jobs for testing in 18 seconds (queued for 2 seconds)