CLC-909 Design refinements round 3
Merge pull request #490 from shacker/CLC-909b

CLC-909 Design refinements round 3