Merge pull request #10016 from ErichBSchulz/refaction_entity_action_permissions