upstream doc update merged