Merge "BUG-2673: Create AbstractRegistrationTree and related classes"