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