Merge branch 'qsub' into union