Merge "Update HV-VES troubleshooting guide"