Merge branch 'devel-2.4' into stable-2.4