LPS-46667

I can apply to the rest of the plugins if this is okay.