merge fixes from 204
merge from v204