fixing api response to octet-stream
fixing merge issue
fixing merge issue