only minor layout changes
Merge branch 'tempdir_in_cpp' into develop
still needs testing on other platforms than Linux