merge changes for storagedir and version