Modify changes with latest RC changes.