Support new ci_ip_diagnostics_kv format

As per  issue #264