Sync up static-html branch with v1.60