Merge pull request #1548 from shackbarth/23243-xwd