merge from trunk, fix conflicts