(#2610) - Make CI build faster