Merge from trunk: