initial rebase of branch nfcTesting