incoterm form view usability issue#2872, backported from "master" at
commit #037019f