Merge branch 'avoid-linking' into nh2work