sync with upstream 1832e60