Merge "Simplifying some view iteration methods" into main