Merge "Apply dim changes only at the end of traversal" into main