Merge branch 'maint-2.4' into maint-2.5