3.2 backported