Merge require changes from edge