Merge wakdev into lpotherat fork

Merge wakdev into lpotherat fork