annotated
Merge ../hpl