LPS-44676 Fix for unit test
LPS-44676 Fix for plugins
LPS-44676 Regenerate