Merge branch 'aii_release' into edge