Merge "assume a generous prior in the rate estimator" into nyc-dev