Merge "BUG-432: remove type argument from Registration"