Merge "Add an alternative to PathIterator.nNext for host" into main