Sync with kumquat and add nfc configuration