(cherry picked from commit cc4d79495f98006f77c68792b946a412f5e86714) Partial cherry-picked. Signed-off-by: Naios <naios-dev@live.de>
(cherry picked from commit cc4d79495f98006f77c68792b946a412f5e86714) Partial cherry-picked. Signed-off-by: Naios <naios-dev@live.de>