Cherry pick replenishment flow

Cherry pick replenishment flow