Merge branch 'v6v7' into devel