WIP
Merge pull request #1 from ericbottard/XD-1104

WIP