Fixing features test
Merge branch 'master' into new_trade_layout