Merge "Call super for skip_checks" into mcp/caracal