Merge branch 'next/spring-cleaning' into next/cleanup