[GIT PULL] TEE fix for v6.3