Add nullsafe fallbacks

Closes #3468341

Merge request reports

Loading