Merge branch 'jc/racy-delay'