Upstream 0.5.2