updated to latest upstream code base