Merge branch 'devel-stable' into for-next