The original fix MR added to #3587865 - but with test added

[Description of changes]

Testing instructions

  • First step for someone to test the changes in this MR

Closes #3587472

Merge request reports

Loading