Generated HTML: Merge branch 'crf'