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