Fixed comments parsing and test added
Merge remote-tracking branch 'pa/comments-parse-fix'

* pa/comments-parse-fix:
  Fixed comments parsing and test added
update CHANGELOG for 5.1.2