Merge "Updated user_add_user_message_long"