Rebase from 'upstream' @ version '0.1.21'