Merge "Fix nfc owners location" into main