upstream op shelf landing changes