Revert "Revert "sonar""

This reverts commit 2f74a819ee880c6c061bbb7bc53f978f670de00c.