LPS-31543

will apply to existing build.xmls if we go with this pattern.