Ajay/Melanie/Vishnu | #3870 |Updated migration