Integrate latest contributions.

Integrate latest contributions.