fix for issue #4819 removing a space to savely recognize header lines
Merge pull request #4825 in master
Merge pull request #4820. Fix #4819
Merge pull request #4820. Fix #4819 in develop