Remove mastertype
Backport server registrations
partially backported auth