Merge "Fix the Rule Updating Issue"