Fixes issue #17379.
integration
This is done separately to ensure that Git is able to track the history correctly.
test