Rebase from 'upstream' @ version '1.9.21'