Feature/hapi.16