CBD-787:  don't use master.xml file, it confuses