Merge branches 'avoid-linking', 'profiling-in-parallel' and 'dont-touch-files' into nh2work