BT-3578 Fix sonar and nostra