1.7.10 update part 6 - squashed commit