Merge branch 'next/cleanup' into HEAD