Merge branch 'cleanups' into next