issue #23243: bugfix build for mfg and xwd