Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev