initial commit from upstream r2710