(cherry picked from commit 3b3a8924773effa59c8e85b6075fd8c659c6e39a)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>