Hapi 6 Preparation

Closes #12