merge 3.3 and 3.2 changes related to 10836