Include the previous changes

Include the ado-matalibs and global-export changes.