Upstream version 1.037