LPS-33626 Plugin changes