Merge "Allow user management on wing/stingray Settings"