Merge remote-tracking branch 'origin/1.0.0-rc1-next'