ZD:168340
ZD:168340

Matching VSTF request.
Merge pull request #5537 from timmyquivy/dev

ZD:168340