Merge in TSMF support