3545328-fix-commerce-3-compatibility

Closes #3545328

Merge request reports

Loading