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