Refactor the patches

Yazan Majadbarequested to merge
issue/tmgmt-3097660:3097660-d11.3.x into 8.x-1.x

Closes #3097660

Merge request reports