Merge "Fix in rule management the sonar detected error"