Rebase from 'upstream' @ version '2.1.16'