Integrate fix that was needed to release v2.54.0.vfs.0.4 (#949)

Integrate fix that was needed to release v2.54.0.vfs.0.4 (#949) #793