Merge branch 'devel-2.4'