merged sysadming with master