Merge "Customer API feedback." into sc-dev