Merge "Revert "Clean up previous DA organizer when registering"" into sc-dev