[577427] Ensure null-free is definition-derived
14 files changed