Merge "added sonar goals"