Update to integrate agita host
Merge with upstream version