LPS-35566 Apply changes to plugins