ISPN-3087 Add whitespace to end of line if necessary to avoid joined words
ISPN-3088 Correctly parse Long values