Merge branch 'code-review' into 'master'

Code review

See merge request apoyen/sdk-go!2
2 jobs for master in 3 minutes and 34 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Sonar Analysis
passed sonarqube #14133

00:01:10

 
  Build
passed build-master #14134

00:02:23