Merge "Update the context used in the image interface" into main