Locale suffix on product attributes in elasticsearch index

[RedwanK]

Upgrading my Sylius (Sf 4.4.25, Sylius 1.9.3) I'm facing some issues dealing with the elasticsearch plugin (v1.6.4).

My main problem is :

1. When I populate my elasticsearch database, attributes indexes are suffixed with the attribute locale code.
2. When I try to filter my products, this locale code is not concatenated to the attribute index.

So I have for example "attribute_busterrain_fr_FR" saved in my EL index, and I try to get product with "attribute_busterrain.keyword = blabla".

My temporary solution is to remove that suffix when I populate elasticsearch by decorating the AttributeBuilder (line 93).

It is possible that I'm missing something, but in my case it is a bug.