Merge branch 'datarace'