Revert "Revert "Merge pull request #2587 from ctweney/clc-3685-c""

This reverts commit e0821a8163c8453272f29b6b30349e81dce2bb29.