Lokesh, Jaideep | FT Refactoring and merge