Merge-fix: ensure record canonical ctors are generated
2 files changed