Update to latest mainline code