https://trufflesecurity.atlassian.net/browse/CSM-1118 Co-authored-by: Kashif Khan <[email protected]>