[GIT PULL] AMDTEE fix for v6.5