[ issue 1156 ] Minor changes
Merge branch 'maint-2.4.2'