Merge "Add try-catch to avoid IllegalStateException in the data parsing" into sc-v2-dev