Merge upstream changes with release 1.8.4