(cherry picked from commit b858d16d ) Signed-off-by: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>