As slava proposed, I would first integrate this PR with current location than if you prefer we relocate pushing up to RECO realm. Anyhow as there are no clients yet there is no code to break with a migration at next round.