Merge "Skip traversing unimportant connections" into main