Merge "add OOF-HAS AAF integration"