Merge "Properly set the estimate of rate_nocoef" into nextgenv2