Smoke 2.1.3

Change-Id: Ie32ddd7955587db1c4e30c44949e5e87814ee142