Finished MOH257
* Requires workarounds for HTML-469 and HTML-459 which should be removed one day