Re-apply patch fixes from #3399739

Closes #3399739

Merge request reports

Loading