Merge "Refactor expand dry_run types to return coef rate" into nextgenv2