Merge require changes from edge (exports replacement)