Merge "Fix bugs found in TN Slicing integration involving OOF"