Merge "Migrate OOF to v14 AAI schema"