Merge branch 'devel-2.3' into devel-2.4