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