Issue #3110095: applied the patch in the issue and removed unnecessary code.

Closes #3110095

Merge request reports

Loading