Merge "Allow duplicate leaf names in Cps Path leaf condition"