RFPL-156: added support for sonar