PDIO-232 Further speed up build