Merge "CNF Healthcheck Workflow broken after macro sql file refactoring"