Applying Amalka's fixes for TA-814_carbon-platform-integration-utils_updated_12_22 and TA-856_carbon-platform-integration-utils_updated_12_22