Merge "Change setup for Go Sonar of nonrtric consumer"