Merge "add a flag for specifying storage root directory"