Merge "adding go-acc and sonar"