Upstream 0.9.37 snapshot