upstream update merged