#9375 and #9189 - add client metadata and improve health messages

Fixed.