Merge "Fix directory iteration when path disappears." into rvc-dev