sync with upstream. v3.11.8-6