Dev merge

Merge latest TFR integration changes.