Merge pull request #6081 from yan12125/skip_problematic_sites