Merge "Use registerIgnoringScore"