Test MR, we are fighting with conflicts in the xmls and it seems nobody uses them directly from the source tree
Includes changes from !22125 (merged) as it fixes a crash on the CI