Merge "Adds an xml file for Context Hub feature"