Merge remote-tracking branch 'upstream/next' into next
Fixed auto merge duplicate methods, caused by pull request modifications