Merge "Fix service validation schema"