CLC-2464 Be more robust in the face of json format changes