Fix TFs from proddebug
@rev eric.anderson@
@bug W-2324487@
Merging origin/amcculloch/master-pending/proddebugTF into master