Merge "Use the correct Edge to Edge flag" into main