Merge branch 'devel-2.1' into devel-2.2