Merge "Add clearAll method to RegistrantList for easier cleanup" into rvc-dev