Wave: Merging from trunk