DDF-364: updates based on code review
DDF-380: Normalize line endings
DDF-364: Updates from code review