S34048 Serengeti changes to support scheduled elasticity