Clear up
bugfix unfolding
unit test correction
#6657 - typo fix, CS (moved comment on a new line
#6657 - s/"/'
#6657 - adding docblock annotation for changed test
Merge branch 'hotfix/#6657-unfolding-of-multi-line-headershould-not-strip-whitespace' into develop

Close #6657