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