Upstream 0.5.3