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