Merge "Changes to rd_variance_adjustment()"