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