Revert "Revert "Merge pull request #2589 from ctweney/clc-3739""

This reverts commit a3bb18c25964bfa707f4855dde89663be96e244a.