Integrated changes from iteratorTraversal branch