Merges entity.ai and entity.ai.attributes with 1.8.