merge 3.2 (#3787e896dbe9)