Merge "Fix duplicate and dangling rules"