Merged html-gen branch