Improve type validation

Closes #3491006

Merge request reports

Loading