Merge branch 'devel-2.2'