[PATCH 1/2] User Data Retry