Upstream version 0.9.58.2