Merge in RED/ui from empty-states to master * commit 'fbb9af29213e396f56e17dfc0a5f71e66553f902': Filter empty states