Revert "Merge branch 'menumt_cleanup' into 'master'"

This reverts merge request !33843 (merged)

The disappearance of the XML files creates some problems: ATR-21612