Merge branches 'avoid-linking' and 'dont-touch-files' into nh2work