Document and test head support
Reduce diffs with master