merge 3.3 (#5289)