fix on enhancement following permissions
Merge branch 'feature/action_enhancement' into feature/permissions2