Upstream version 20210117.git2b3823e