Fix logical conflict between !1466 and !1494

Merge request reports

Loading