Porting complete

to 3.2.x