Merge "More flexible logging from PluginInstance" into main