Merge branch 'hotfix/compute-race'