Allow non-table allowed fields in shipments
Merge branch 'master' into workshop