WP-4361 update key image field
WP-4396: update the field group.