Merge branch 'next-cleanup' into for-v3.7