[GIT PULL] TEE fix2 for v6.17