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