Second batch for 2.6