1.4, merging shipto fix from 1.3