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