Ajay/Ashwin | #0000 | Stabilizing smoke test