Merge branch 'hotfix/fix_actions_disabled_priorities'
Entity filter type didn't do anything
Merge branch 'hotfix/fix_entity_filter' into develop