Merge "Fix bugs in torq" into main