Upstream version 1.37.0