Issue #2283759 followup: fixing support for image fields