FS-5401 --resolve whitespace only