Converging commits from 1.0.0-alpha branch and master.