Merge branch 'feature/dot-html-nodes' into par-tools