Upstream v8.93 code backported