Merge branch p2nfft_nc0dp
manual: update feature matrix