Merge branch 'next/cleanup' into late/kirkwood