Revert "Revert "Merge pull request #2598 from christianv/CLC-3830""

This reverts commit 53b3077db640ad165431f585c025e79fbd9f3bec.