Merge "Correct VALIDATION_TIMEOUT_MILLIS value to 3000 ms"