Merge branch 'depends/cleanup' into next/dt