MarketImpl minor changes
Merge remote-tracking branch 'origin/master'
MarketImpl minor changes 2