merging shipto fix from 1.3