merge from 4.3_r2.2