Merge "NFC: Enhancement of the refresh tag process"