Merge branches 'next/cleanup' and 'next/fixes-non-critical' into next/cleanups-fixes