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