'Cherry pick' of work previously committed to Dev_Working with PR #1870:#2050

Merged

StephenHodgson merged 1 commit intomicrosoft:may18_devfrom PJBowron:may18ExtendWsaInputSourceData

May 5, 2018

+87-14

Commits on May 5, 2018

'Cherry pick' of work previously committed to Dev_Working with PR microsoft#1870 :
PJBowron
committed