Merge "[bugfix]remove excess whitespace" into SZZT