Merge pull request #12853 from seamuslee001/nfc_case_dashboad