close #4358

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