fixed merge for 2.3.2 #2949