LPS-35335 apply same changes to plugins