build fixes including plug-in executions
Merge