Bring up to date with upstream code