This might be a wrong merge. I thought the reset of the OC name field was only recently introduced by someone (and should probably survive your changes).