Issue #3218909: fix-schema-map

Loai Lababneh requested to merge issue/image_field_360-3218909:3218909-fix-schema-map into 8.x-1.x Jun 15, 2021