[GIT PULL] TEE Cleanup for v5.19