Merge 3.1 back

Merge back from 3.1