Merge "Fix problem with dangling check of rules with multi-rules"