Squashed commit to 3.4.69
Squashed commit to 3.4.70
fix build errors