LPS-45315 Plugins SF

Let me know if you want me to create a different ticket for this rather than including it in LPS-45315 since this is in plugins.