Merge "AAF Integration for OOF-HAS"