synchronized against upstream
syncronized against upstream
sync with upstream. v3.11.8-6