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