Sync upstream and add image_process functions