Back-ported fixes to v8, 8.1.12
Fix backport
More fix backporting