Merge "make aai paths consistent"