Merge branch 'nd/no-more-check-racy'