Fix parent source as being set as Xray, when trace merging disabled#60
Merged
DarcyRaynerDD merged 2 commits intomasterfrom May 14, 2020
Merged
Fix parent source as being set as Xray, when trace merging disabled#60DarcyRaynerDD merged 2 commits intomasterfrom
DarcyRaynerDD merged 2 commits intomasterfrom