Merge "Modify RuleList and RuleInfo"