Merged to 8.x.1-dev, will release to new version