SONARPLUGINS-3217 Change implementation