added some base logic for Mercury230
Merge remote-tracking branch 'origin/twisted' into twisted