Shipping mode validation
Merge branch 'master' of https://github.com/venkateshmani/trinity