Code

Merge branch 'lt/racy-empty'