Merge branch 'clps711x/cleanup' into next/cleanup