Merge "Deal with null characters in string options."