update to latest mainline changes