Merged SOC 2 to SOC 1 comments