Merge branch '30_typo_fixup'