pulling in 6-8-stable updates