Signed-off-by: Alexander Trost <galexrt@googlemail.com>
(cherry picked from commit 16e3b736)