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