issue #23243: bugfix build for mfg and xwd
Merge pull request #1548 from shackbarth/23243-xwd

issue #23243: bugfix build for mfg and xwd