integrate Wak8 updates to master