Resolve #3501907 "Improve checks for"

Closes #3501907

Merge request reports

Loading