Merge branch 'hardening_types'