Merged caoAgent and noptilus plug-ins.