refactor: update patch to apply to 2.2

Closes #2599090

Merge request reports

Loading