Merge branch 'devel-stable' into devel