Working solution with test for #3560659

Closes #3560659

Merge request reports

Loading