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