Merge branch 'ew/server-info-remove-crufts' into maint