Merge "Fix backward compatibility, storage_type/invetory reclass defaults"