Update 3.2 --> 3.3
Close #3601