Re-rolled patch from #106, removed coding standards updates and added a check of field items to only apply the remove button when the field is not a new/blank field item.
Re-roll of patch from #105 → for 8.2.x