Merge pull request #2371 from ntrel/fif-strings