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