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

shouldn't we warn on insertion rather than on gathering?