Merge branch 'afh_cleanup' into next.