Merge "Moved data retry handler from broadcast to message."