merge with current develop & fix line endings

merge with current develop & fix line endings