Merge "Remove the has_no_coeffs corner case" into nextgenv2