update from branche: Image_proxy