Merge "Fix VFS cache consistency race" into rvc-dev