Merge "Add mechanism to register single task organizer"