Merge "[TOFU] Implement a secure TOFU flow" into tm-dev