Merge branch 'staging'

Signed-off-by: Siwara Sadikow <siwara.sadikow@iese.fraunhofer.de>