Merge branch 'hotfix/fix_columns_deletion'
Merge branch 'release/staging'
Merge branch 'release/staging'
Fixes bug that prevented showing the scrollers
Merge branch 'hotfix/filters' into develop

* hotfix/filters:
  Fixes bug that prevented showing the scrollers