Merge branch 'next/cleanup2' into HEAD