Latest DEV changes

Signed-off-by: Dom Pascal <dom@dompascal.com>