New TS, Convert fixes
ORS Swap
Merge remote-tracking branch 'upstream/master'