add missing commit from upstream