Merge "BUG-113: split HandlerRegistry into per-class registries"