merge from gwt branch