update to latest upstream changes