Merge "Fix storage_protocol"