[fixed?] trading with full inventory, fire dot incap

Change-Id: I581274864d777e4230c4d831aa564f00070d24f8
Merge "[fixed?] trading with full inventory, fire dot incap" into unstable