Merged in html and bumped version to v1.6204