- [20.2] Registry rework (#257)