Merge branch 'UpdateBuildStructure' into 'master'

simplified build

See merge request !4
3 jobs for master in 48 seconds (queued for 4 seconds)