LPS-33626 Apply to plugins
LPS-33626 Backwards compat