hapi 8. Closes #37