Merge branch 'sg/ci-parallel-build'