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

Job	Run time
PR formatting / clang-format	24s
PR formatting / line endings	23s
PR formatting / copyright headers	14s
PR formatting / pragma-once	7s
PR formatting / whitespace	13s
	1m 21s

Provide feedback