Fix issue with new eogen multiline format
Merge branch 'eclipse_3_7' into integration