Merge "Remove check for API version in validate_scheduling"