Tweak shipping language Closes #5030