Skip to content

Initial commit from the patch in #154 comment.

Resolve the merge conflicts. Perform other necessary changes.

Closes #2640994

Merge request reports