updated to be in line with interrogator etc
updated to be in line with interrogator etc


Former-commit-id: 37b9863e88974fee9cb954ef19a5c39b921bbb18 [formerly 098797382f7fabc89e7423e8de716de0fdba45ef] [formerly 37b9863e88974fee9cb954ef19a5c39b921bbb18 [formerly 098797382f7fabc89e7423e8de716de0fdba45ef] [formerly 098797382f7fabc89e7423e8de716de0fdba45ef [formerly a4941166963bbee68fff892f0a7f368a2b4edb7d]]]
Former-commit-id: 6a7046e91c84f181020738be6ef70bbd91f16a4c
Former-commit-id: 53006e2e0394db2212c25a86ac2951398035b65a [formerly ff79a3b6b159ed2c397fdc67e65ce0830da960cf]
Former-commit-id: 0f179e6ce5967e928243491cc36076cd7fe67dd1
interrogator/corpkit,interrogator/corpkit