Issue #27867: Fixed merging error.
1 file changed