Merge master code.

Merge master code.