Ajay/Pooja | #3362 | Stabilizing fts.