Ajay/Melanie |#0000| Fixing flaky FT
Commiting submodule changes