Following latest upstream changes