Merge branch 'fix_ai'