Fix TPR.QE - Defect # 23139

This should resolve JIRA bug AN-353 (and duplicates). May also resolve
AN-350
Should fix AN-354 and AN-364

we'll see……
Fixes AN-350

And and AN-356 and other duplicates… hopefully.
Merge branch 'att-overlay-fixes'