Updated TMP for WF-1818

Updated TMP for WF-1818