Code

Merge branch 'cn/eradicate-working-copy' into maint