Merge master with 1.0.0-alpha.3