Revert "Revert "Merge pull request #2592 from christianv/CLC-3822""

This reverts commit 2a8063a9f7f00b88a10faaaad9683d5edfd3c0e2.