Merge nfc from NB1