Integrates following changes: -upstep to v1.8.0 References: Backported ticket PPW-297, backport ticket PPW-1280 Signed-off-by: FAOUZI YAHYA <faouzi.yahya_ext@softathome.com>