Replace reference to flexible entity
Replace reference to flexible entity
Replace reference to flexible entity
Remove deprecated argument in FiltersConfigurator constructor
Merge branch 'master' into PIM-2436