Update 3_2_X_hybrid branch with latest fixes from 3_2_X