Fixed #23092: Squashing handles external dependencies