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