Another large batch of commits squashed