sync with upstream r1040