Squashed commit of changes from the 4.8-temp branch.