Finish QA for new feature

Now just need to decide the day to make the migration.