I think this could use a few dev releases to smoke out any issues, so would prefer to land it post 2.13 is cut.