Merging from trunk and add some comments.