Merge "Handle the edge to edge problem" into main