#5395 Announce/scrape robustness -enhancement- fixed