Skip to content

Apply changes from patch 5 in issue 3366926

These changes have been adapted from the patch slightly.

Closes #3366926

Merge request reports