Merge "Don't try to recreate IncrementalFileStorages on re-commit." into rvc-dev