Merge "AAI-2198 Consistent code style in traversal"