Issue #21614: Fixed lint problem with strings merge