Merge "config seg aai resources and traversal"