Merge "Update remex-html library to 2.1.0"