upstream: 2312a48f6e2df7900bf1c221801a015643cd3683