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