Merge "Add ping_retry function to THT validation script" into stable/colorado