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

Job	Run time
PR formatting / line endings	22s
PR formatting / clang-format	31s
PR formatting / copyright headers	13s
PR formatting / pragma-once	7s
PR formatting / whitespace	17s
	1m 30s

Provide feedback