Merge 2.0-maint into master