Wave: merging from trunk