OOIION1381 TMPSF Engineering Fix
Merge pull request #130 from emilyhahn/tmpsf-r2

OOIION1381 TMPSF Engineering Fix