Merge "Fix broken 05-clustering.xml"