Fix merge conflict bentween DCB-243 and smoketest