Merged into master branch as 2c7119b43bd44ee812ceaa2351bff9a8b623a920.