Merge "aai resources and traversal config alignment"