more support for new trade types
Merge branch 'develop' into ui/dev