add no-extra-files test
Merge remote-tracking branch 'upstream/master'
remove NP (invalid name)