Merge branch 'next' into image-management