FEND-946: Fix bad file from squash-merge