Resolve #3330729 "Wrongly adjusted shipping"

Closes #3330729

Merge request reports

Loading