Merge branch 'davinci/cleanup' into next/cleanup