SSLR-353 Merge sonar-channel into sslr