Consolidate changes into 2.9.x branch