Fix #1937 and #1934

Merge request reports

Loading