fix merge for 3.3

#1527