Merge "only use new storage for read write" into main