Testing dev subsys

Signed-off-by: Olli Vanhoja <olli.vanhoja@ninjaware.fi>
Merge branch 'dev'
Merge remote-tracking branch 'origin/master' into dev