Modify diff for feature-scheduler branch