Merge "Sonar clean-up: OF13Provider"