Upstream merge @ 0.9.3