Merge "Handle the Edge to Edge problem" into main