Brute force update for 2.7 -> 2.8 stable