Existing registration should check for inactive records too #3445

Review ID: 1593002