Code

Merge branch 'lt/racy-empty' into maint