Merge recent 3.00 changes into 3.10