LPS-47091 Fix for plugins