Merge "[incremental] storage is regarded as fully loaded if there's no file or only empty files"