Merge branch 't/aft_cleanups'