Rebase from 'upstream' @ version '0.3.16'