[AC21.4] Follow-on patch for parallel builds