Merge "Improve SDNC Sonar coverage"