Merge branch 'refs/heads/t/aft_fixes'