Revert "Revert SONAR-4785"

This reverts commit a42510b9e77d6ba9938f0d578e3b0253a136e4e1.