Merge "Configure Sonar for HICN"