Revert "Revert "Merge pull request #2586 from ctweney/clc-3685-b""

This reverts commit d2d39825c3cc169aa84cf19765a74cad26430a21.