Merge "Add TestApi to clear organization Id" into sc-v2-dev