Latest upstream changes ready for pull request