Merge 1.9.2 changes into fork