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