Merge branch 'feature/multiple-users-activation-permissions' into 'develop'