Related to SONARPLUGINS-1778