Finish migrating off of @import
and global built-ins
#2005
Merged
@import
and global built-ins
#2005