Merge "Revert "BUG-2637: migrate features""