Merge branch 'charm' into typed_reductions