LPS-48299 Plugins changes for the same ticket