Merge "Refactor T110 rule"