Merge branch 'dev'

Signed-off-by: Matthias Koller <m.koller@peak-solution.de>