Improve build time [RTFACT-20558]