Merge branch 'sw_tso'