Rebase from 'upstream' @ version '1.8.8'