Merge "Fix parallel install"