Merge: Fix regressions in make