Merge "Validate scheduling fields in basic ops scenario"