Merge "Supports 3rd party json for measurements"