Work on 9.2.2
Merge upstream changes