Merge remote-tracking branch 'origin/alpha' into dev

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Update config load function to be more robust and give more feedback

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Merge remote-tracking branch 'origin/dev' into alpha

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Fix typo

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Merge branch 'dev' into alpha

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>