Merge "Use new traversal function when order doesn't matter"