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