HOTFIX: DDBNEXT-1565 Problems with Keep all filters and Remove all
filters
Merge branch 'DDBNEXT-1565-BOZ' into develop