Merge "Fix reported sdlgo testing coverage at sonarcloud.io"