close #4358

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