Match latest upstream changes