Merge "[AAI] OOM AAI traversal logging structure enhancement" into kohn