DEV-51 | Update format in raw + image