Revert "Revert "Merge pull request #2582 from ctweney/clc-3817""

This reverts commit ede62e093288e70127bab805795b367d62fa343f.