Merge branch 'jobson' into ts01