Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 730a12716efce66263da55045eac69554c24bc1b) Signed-off-by: Armin Kuster <akuster808@gmail.com>