fixed merger for 2.3.2 #2918