Squashed 3.4.42 & fixed some previous merge errors