DDBEASY-173 - Facets elimination.
Merge branch 'DDBEASY-173' into develop