Merge remote-tracking branch 'maint-2.4.2'