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