#3555 done
Merge remote-tracking branch 'origin/#3655-storage-engine-refactoring' into master-3655-storage
StorageFile refactoring