Split deferred_user_data into two API endpoints.
#3975
+49
−11
Merged