Merge from trunk not 10.0-base