Merge branch 'core/cleanups' into auto-core-next