merge changes from trunk/2.3.1-6 into 2.4 branch