Merge branch 'heads/next' into devel