merge 4f3017e from upstream