First merge into 'master' branch.

First merge into 'master' branch.