Merge "Fix extractRelativePathForDirectory for single char directory names" into rvc-dev