Merge pull request #539 from MrPetovan/bug/4555-remove-active-users-feature