[RFR] Keeping in sync with changes to stock migration in other PR