[CDF-238] - Reviewed build process for CFR