Fixed #28, remove short and collateral actions from market transaction scan
merge from remote develop