CA-108508

This is a duplicate of what's gone into the Clearwater branch.