Revert "Revert "CH7 SONAR bug fixed""

This reverts commit b3b42d560db1381c21bee34a09a7cb9ed15cfab3.