Merged changes by henryzhao81