Merge branch 'sirf/cleanup' into next/cleanup