large batch of changes to align with master (up to 20k)