Revert "Revert "Merge pull request #2595 from ctweney/clc-3730""

This reverts commit 3cb05467c2c3ec5dddf77f5308cfc3e0ea8c26ee.