Merge "Allow concurrent build for oc"