Integrate earlier changes

Put in the global-export and ado-matalib changes from earlier.