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