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