fix to fix
Merge branch '21-apply-dots' into 22-gc-old-to-new