RSX : Reapply fmt::merge change & VFS change