[CLC-949] Path corrections from Darlene
Merge pull request #475 from yuhunglin/CLC-949

[CLC-949] Path corrections from Darlene