CLC-4508
Merge pull request #3127 from pfarestveit/clc-4508

CLC-4508