Merge branch 'exports'