Fixing handling of edge clusters - DON'T MERGE #23129

Job	Run time
PR formatting / copyright headers	13s
PR formatting / clang-format	30s
PR formatting / line endings	21s
PR formatting / pragma-once	6s
PR formatting / whitespace	16s
	1m 26s

Provide feedback