Merge branch 't/ao_fixes'