Merge pull request #9695 from diizzyy/admin-netdata