Apply patch made to version 1.20.1 to version 1.18.0. Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>