Merge "Separate rate_correction_factor for boosted GFs"