PIM-3229 Display choice attribute values with missing translations in the grid
PIM-3309: Clean bc fix