patches refresh to match latest upstream code