Latest upstream version fixes #584984, #758123.