42.type

This @folone's branch, cherry-picked onto 2.11.x - opening a PR so that we can play around with it.