Issue #3522138: Make it compatible with commerce v3

Closes #3522138

Merge request reports

Loading