Please merge changes with master / trunk.

Please review these changes and provide comments.