Restore previous behaviour removed during refactoring of TrigTauRecMerged
This MR reimplement the changes added in !63488 (merged) that were reverted later on !63733 (merged) due to the issues below, these should be fixed now, apologies for the meesss. Addresses ATR-27533 while fixing ATR-27748, ATR-27750, ATR-27753
Edited by Edson Carquin Lopez