Merge branch 'image-management' into next